Implement gdk_window_reparent.

2008-03-11  Richard Hult  <richard@imendio.com>

	* gdk/quartz/gdkwindow-quartz.c: Implement gdk_window_reparent.

svn path=/trunk/; revision=19746

diff --git a/ChangeLog b/ChangeLog
index d473ccf3d24b20e854693b6379b26441707de30d..bc06afd99b0b049877dd0231f13b1bfb30263cee 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2008-03-11  Richard Hult  <richard@imendio.com>
+
+       * gdk/quartz/gdkwindow-quartz.c: Implement gdk_window_reparent.
+
 2008-03-10  Tor Lillqvist  <tml@novell.com>
 
        * tests/teststatusicon.c (do_exit, popup_menu): Add the

diff --git a/gdk/quartz/gdkwindow-quartz.c b/gdk/quartz/gdkwindow-quartz.c
index 932e5f568bb7442be0bde2b96a323507d39ed9af..ed385aa4bb5779e9403ed47326aa59708b5f2c55 100644 (file)
--- a/gdk/quartz/gdkwindow-quartz.c
+++ b/gdk/quartz/gdkwindow-quartz.c
@@ -1437,14 +1437,51 @@ gdk_window_move_resize (GdkWindow *window,
 
 void
 gdk_window_reparent (GdkWindow *window,
-                    GdkWindow *new_parent,
-                    gint       x,
-                    gint       y)
+                     GdkWindow *new_parent,
+                     gint       x,
+                     gint       y)
 {
-  g_warning ("gdk_window_reparent: %p %p (%d, %d)", 
-            window, new_parent, x, y);
+  GdkWindowObject *private, *old_parent_private, *new_parent_private;
+  GdkWindowImplQuartz *impl, *old_parent_impl, *new_parent_impl;
+  NSView *view, *new_parent_view;
 
-  /* FIXME: Implement */
+  if (!new_parent || new_parent == _gdk_root)
+    {
+      /* Could be added, just needs implementing. */
+      g_warning ("Reparenting to root window is not supported yet in the Mac OS X backend");
+      return;
+    }
+
+  private = GDK_WINDOW_OBJECT (window);
+  impl = GDK_WINDOW_IMPL_QUARTZ (private->impl);
+  view = impl->view;
+
+  new_parent_private = GDK_WINDOW_OBJECT (new_parent);
+  new_parent_impl = GDK_WINDOW_IMPL_QUARTZ (new_parent_private->impl);
+  new_parent_view = new_parent_impl->view;
+
+  old_parent_private = GDK_WINDOW_OBJECT (private->parent);
+  old_parent_impl = GDK_WINDOW_IMPL_QUARTZ (old_parent_private->impl);
+
+  [view retain];
+
+  [view removeFromSuperview];
+  [new_parent_view addSubview:view];
+
+  [view release];
+
+  private->x = x;
+  private->y = y;
+  private->parent = (GdkWindowObject *)new_parent;
+
+  if (old_parent_private)
+    {
+      old_parent_private->children = g_list_remove (old_parent_private->children, window);
+      old_parent_impl->sorted_children = g_list_remove (old_parent_impl->sorted_children, window);
+    }
+
+  new_parent_private->children = g_list_prepend (new_parent_private->children, window);
+  new_parent_impl->sorted_children = g_list_prepend (new_parent_impl->sorted_children, window);
 }
 
 void